Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update slices dependency to use Compare #2424

Merged
merged 16 commits into from
Dec 5, 2023
Merged

Update slices dependency to use Compare #2424

merged 16 commits into from
Dec 5, 2023

Conversation

StephenButtolph
Copy link
Contributor

@StephenButtolph StephenButtolph commented Dec 4, 2023 •
edited
Loading

Supersedes: #2405 and addresses: #2409

StephenButtolph
StephenButtolph commented Dec 4, 2023
View reviewed changes
utils/sorting.go
Comment on lines -35 to -40
// Sorts a 2D byte slice.
// Each byte slice is not sorted internally; the byte slices are sorted relative
// to one another.
func SortBytes[T ~[]byte](s []T) {
slices.SortFunc(s, func(i, j T) bool {
return bytes.Compare(i, j) == -1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt like this function wasn't really needed anymore.

StephenButtolph
StephenButtolph commented Dec 4, 2023
View reviewed changes
utils/sorting.go
Comment on lines 21 to 24
// Sorts the elements of [s].
func Sort[T Sortable[T]](s []T) {
slices.SortFunc(s, T.Less)
slices.SortFunc(s, T.Compare)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly - this function could probably go as well

@StephenButtolph StephenButtolph self-assigned this Dec 4, 2023
@StephenButtolph StephenButtolph added dependencies This primarily focuses on changing a dependency cleanup Code quality improvement labels Dec 4, 2023
@StephenButtolph StephenButtolph added this to the v1.10.18 milestone Dec 4, 2023
@StephenButtolph StephenButtolph marked this pull request as ready for review December 4, 2023 22:36
@StephenButtolph StephenButtolph mentioned this pull request Dec 4, 2023
Closed
marun
marun approved these changes Dec 4, 2023
View reviewed changes
genesis/config_test.go Show resolved Hide resolved
ids/id_test.go Outdated Show resolved Hide resolved
utils/sampler/weighted_array_test.go Show resolved Hide resolved
utils/sampler/weighted_heap.go Show resolved Hide resolved
vms/avm/txs/operation.go Show resolved Hide resolved
x/merkledb/history.go Outdated Show resolved Hide resolved
poopoothegorilla
poopoothegorilla approved these changes Dec 5, 2023
View reviewed changes
Copy link
Contributor

@poopoothegorilla poopoothegorilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

@StephenButtolph StephenButtolph added this pull request to the merge queue Dec 5, 2023
Merged via the queue into dev with commit b6700c9 Dec 5, 2023
16 checks passed
@StephenButtolph StephenButtolph deleted the update-exp-slices-2 branch December 5, 2023 03:47
joshua-kim added a commit that referenced this pull request Dec 6, 2023
@joshua-kim
Squashed commit of the following:
8866972 
commit b36416d
Author: Alberto Benegiamo <alberto.benegiamo@gmail.com>
Date:   Wed Dec 6 12:12:11 2023 -0700

    Drop Pending Stakers 1 - introduced ScheduledStaker txs (#2323)

    Co-authored-by: Stephen Buttolph <stephen@avalabs.org>

commit 7df1f3a
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Wed Dec 6 13:46:56 2023 -0500

    Restrict GOPROXY (#2434)

commit 21b7ab8
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Tue Dec 5 19:43:00 2023 -0500

    Fix platformvm.SetPreference (#2429)

commit ada692a
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Tue Dec 5 17:40:03 2023 -0500

    Update minimum golang version to v1.20.12 (#2427)

commit 004a23e
Author: Dhruba Basu <7675102+dhrubabasu@users.noreply.github.com>
Date:   Tue Dec 5 12:56:25 2023 -0500

    `vms/platformvm`: Add `decisionTxs` parameter to `NewBanffProposalBlock` (#2411)

    Co-authored-by: Dan Laine <daniel.laine@avalabs.org>

commit 439dc1e
Author: Alberto Benegiamo <alberto.benegiamo@gmail.com>
Date:   Tue Dec 5 10:46:13 2023 -0700

    ProposerVM Extend windows 0 - Cleanup (#2404)

    Co-authored-by: Stephen Buttolph <stephen@avalabs.org>

commit 477157d
Author: Dhruba Basu <7675102+dhrubabasu@users.noreply.github.com>
Date:   Tue Dec 5 11:10:56 2023 -0500

    `vms/platformvm`: Cleanup some block tests (#2422)

    Co-authored-by: Dan Laine <daniel.laine@avalabs.org>

commit b6700c9
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Mon Dec 4 22:24:34 2023 -0500

    Update slices dependency to use Compare (#2424)

    Co-authored-by: James Walker <jim.walker@smartcontract.com>

commit 5d9e482
Author: Dan Laine <daniel.laine@avalabs.org>
Date:   Mon Dec 4 19:27:29 2023 -0500

    allow user of `build_fuzz.sh` to specify a directory to fuzz in (#2414)

commit 2e32281
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Mon Dec 4 18:30:41 2023 -0500

    Fix duplicated bootstrapper engine termination (#2334)

    Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
    Co-authored-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

commit b741c19
Author: Dhruba Basu <7675102+dhrubabasu@users.noreply.github.com>
Date:   Mon Dec 4 17:49:15 2023 -0500

    `vms/platformvm`: Move `VerifyUniqueInputs` from `verifier` to `backend` (#2410)

commit 6aa20fc
Author: Dhruba Basu <7675102+dhrubabasu@users.noreply.github.com>
Date:   Mon Dec 4 17:32:07 2023 -0500

    `vms/platformvm`: Initialize txs in `Transactions` field for `BanffProposalBlock` (#2419)

commit c11accd
Author: Alberto Benegiamo <alberto.benegiamo@gmail.com>
Date:   Mon Dec 4 09:16:01 2023 -0700

    Drop Pending Stakers 0 - De-duplicate staking tx verification (#2335)

commit 05ce366
Author: marun <maru.newby@avalabs.org>
Date:   Sat Dec 2 13:33:18 2023 -0800

    testing: Update to latest version of ginkgo (#2390)

commit 04af33e
Author: Dhruba Basu <7675102+dhrubabasu@users.noreply.github.com>
Date:   Sat Dec 2 16:33:07 2023 -0500

    `vms/platformvm`: Cleanup block builder tests (#2406)

    Co-authored-by: Stephen Buttolph <stephen@avalabs.org>

commit 7623ffd
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Fri Dec 1 19:39:15 2023 -0500

    Update versions for v1.10.17 (#2394)

commit be1a2ad
Author: aaronbuchwald <aaron.buchwald56@gmail.com>
Date:   Fri Dec 1 13:31:49 2023 -0500

    Add more descriptive formatted error (#2403)

    Co-authored-by: Stephen Buttolph <stephen@avalabs.org>

commit 9b85141
Author: Dhruba Basu <7675102+dhrubabasu@users.noreply.github.com>
Date:   Thu Nov 30 12:42:36 2023 -0800

    `vms/platformvm`: Move `GetRewardUTXOs`, `GetSubnets`, and `GetChains` to `State` interface (#2402)

commit de3b16c
Author: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
Date:   Thu Nov 30 12:49:53 2023 -0500

    Add `p2p.Network` component (#2283)

    Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
    Co-authored-by: Stephen Buttolph <stephen@avalabs.org>

commit 0ab2046
Author: marun <maru.newby@avalabs.org>
Date:   Thu Nov 30 09:18:59 2023 -0800

    Rename `testnet` fixture to `tmpnet` (#2307)

commit 907b34c
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Wed Nov 29 21:32:43 2023 -0500

    Update bootstrap IPs (#2396)

commit 96d451d
Author: Stephen Buttolph <stephen@avalabs.org>
Date:   Wed Nov 29 18:15:47 2023 -0500

    Periodically PullGossip only from connected validators (#2399)

commit 0da5bcc
Author: Dan Laine <daniel.laine@avalabs.org>
Date:   Wed Nov 29 16:32:16 2023 -0500

    Remove method `CappedList` from `set.Set` (#2395)

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
marun pushed a commit that referenced this pull request Dec 22, 2023
@StephenButtolph @poopoothegorilla @marun
Update slices dependency to use Compare (#2424)
a5adfa2 
Co-authored-by: James Walker <jim.walker@smartcontract.com>
@dhrubabasu dhrubabasu mentioned this pull request Dec 27, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmank88 jmank88 jmank88 left review comments

@marun marun marun approved these changes

@poopoothegorilla poopoothegorilla poopoothegorilla approved these changes

@dhrubabasu dhrubabasu dhrubabasu approved these changes

@danlaine danlaine Awaiting requested review from danlaine

@darioush darioush Awaiting requested review from darioush darioush is a code owner

@dboehm-avalabs dboehm-avalabs Awaiting requested review from dboehm-avalabs

@abi87 abi87 Awaiting requested review from abi87

@gyuho gyuho Awaiting requested review from gyuho

@joshua-kim joshua-kim Awaiting requested review from joshua-kim joshua-kim is a code owner

Assignees

@StephenButtolph StephenButtolph

Labels
cleanup Code quality improvement dependencies This primarily focuses on changing a dependency
Projects
Platform Engineering Group
Archived in project
Milestone
v1.10.18
Development

Successfully merging this pull request may close these issues.
5 participants
@StephenButtolph @marun @jmank88 @poopoothegorilla @dhrubabasu